auto merge of #689 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 10 Oct 2014 15:05:22 +0000 (15:05 +0000)
committerbors <bors@rust-lang.org>
Fri, 10 Oct 2014 15:05:22 +0000 (15:05 +0000)

Trivial merge